From 80037c0d10837f25d4190f6c187057103aea8fff Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Dec 2010 09:18:55 -0800
Subject: [PATCH] ChangeLog merge fix.

---
 doc/emacs/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ba4af633618..33f830458ca 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -26,7 +26,6 @@
 	(Windows Startup): New node.  Move the stuff about the current
 	directory from "Windows HOME".
 
-2010-12-13  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
 2010-11-27  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
 
 	* maintaining.texi (VC With A Locking VCS, VC Directory Commands):
-- 
2.30.2